final commit 07-12