change writer
Merge branch 'wj_dev'