Updated switch variables to true