Added else/if