Mostly change to make queuing direct work