Modified export