Added velocity conservation (not sure if it works in SMP)