fixing edit order WIP