Is changing a queue intended? I'd rather remove this if we do not need it.