Final change: Didn't like where this condition lied