Update columns
Merge branch 'Zhaodong'