Export now also works