worked on move and edit