switching now working