Rebuilt editor