Added 'editing' functionality