added generic generator
Everything works now.