switching improvements