Fixed edit flow