Locked down my personal changes from a very old fork