Rework of the motion model, to make it more explcit.