commit 06-11