pre-final commit 0.9