reducing the number of errors from the refactor of invocation/queues