Removed generator, moved enq