Updated for the build server and the start of a spike