New(old) version of generator
Resolve conflict