added editing support