partial commit 7