Updated to include motion model.