Got rid of old generator. Massive update