Adding motion control