Massive editing overhaul