changed to allow for exporting