took out problematic else statement