Revise the way that executions are handled