Updated for Motion Detect & quat updates after motion transition