first changes
edit from 2
merge