Moved edit code back into coordinator