final changes of dev_2