UC-53 Make logic better