Added editing stuff