Improve Generator