restructuring: partial commit