Adjusted condition checks