changed way of exporting functions