partial commit #2