Added else if conditional