Major changes to build file