Added some editing