Updated buildscript