Added else to loop