Rebuilding to take account of new structure