Improved conditions order