Took out other if statement and added actual else to conditional