some switch stuff back on, merged with rest