more changes to allow use of flint ZZ code.  Default is the orginal still