added editHandler