Made the buildscript better