lots of optimization changes from gena-m