updated status from sau commit c6b6033