remove magical 0.2 and use of velocity_map