comment wrong code
Merge remote-tracking branch 'origin/liz_dev' into liz_dev