v2 rebuild for GP site