Added if/else/elseif