Some updates to branch 3