Touching up restructure.