commit 24/09 2