Work on edit server