Finished edit#1