commit 08-18