Updated build-script