Bringing the fork up to date with the project