modified function export