change the else to and if