overhaul of generator code