Update to movement class