Made the build go through and did some regrouping