Adapted to motion 2