more exec refactor