Added some velocity checking
Where did this come from?