commit 30/09 2