Reworking the moving system