revamping build script
fix build