Change if conditions