update

update 1 and 2