commit 08-18-2
commit 08-20