Got the edit flow working with the new perf optimisations