Better switch sizing