Final Commit for version 2.0