partial commit 11