I commented out the if else statement