updates for q auto delete and using an existing q