better velocity handling