working on editing feature