Add Version 2.0 Code
Merge branch 'chin'