New version of Gen++

Seems stable enough.