Better ordering of conditions