Minor edit to attempt to fix infinite ques (updates for other parts coming soon)