Complete update with new Grid generator