Commit 5 - some minor changes to dev3