Also updated build script