added unit 2 from zonghe
Merge branch 'unit-data' into use-better-list-view