Added else if conditional on line 15