a temp commit before restruct for switch context