Committing all updates to version 2.0