Some improvements on the movement system