Delayed abort WIP
Invocation re-factory
Invocation re-factory