new fly & moved some define around in library