reordered build bits to fix errors