Added else-if