change boilerplate for new swticher