updated build script and helper