Adding proper velocity integration