Evaluate bug fixed, generator added