modified to work
add exporter