Added getVelocity & setVelocity