fix and add export