Move initila switch to after initial input