Enhanced editing