Updated with more readable condition