IMproved edit flow