Pulled from 2003 raptor 80

Functions as intended