Changes in GenerationClass

Review this code