partial swap from core to compilestate 2