Updated for new pwf-queue