Update to Condition Screen Logic