Added else if-statement