ADD: Generator is working slightly worse now....also panics?