further separate the rebuild methods