not using the data_queue any more