Conditions check logic optimised