edit and new changes 2