Reduce queuing time from 10s -> 2s