more tweaking to the build