Added angular velocity and distance calculations