Updated Buildscript 2