remove comments
Merge branch 'try3'
update with Chris's change