Tkuldeep/197 domain switcher