commit 9/04 - in progress