Fixing history / preop to match work done