Tried to improve build scripts...FAIL