Added some switch stuff