Modified for rebuilding off baseboxes