clean up, added velocity component