Updated switch model