Fix function calls. Exporter is now working