updated to export methods