Re-apply core option to switch out L and Z Part2