refactored tandem queue some more