Changed if order