3Queue working, removed #ifdefs