fixed silly switch() use, much better handled with if..elseif..else