and finish implementing switch pos fix