more switch stuff