Issue664 improved track infill