>>> Committed restructuring
<<< done.
