A new build, incorperating the latest changes