Patches applied
Queue set made simpler