other half of restructure commit