Added state and velocity