Removed the elseifs