include old queue in new rap tool