Further additions to commit 1