updated edit flow