Updated Build, new index