partial commit 5