Prepare edit and new action #2 #3
Close #2