Re-implement editor