update for 1.2.0
update for 1.2.0