revised the build helpers