Main is improved (switch not redundant)