I don’t think the integration test will still fail after my PR, but thats probably besides the point since at this point its just lock optimization