Make mandatory_completed less complex