export support - but needs tests and adjustments