Updated the build a bit: