Some changes to make to the build function