Refined the composite export somewhat