Move velocity calculation to Space