better edit flow