Modified new build system