Exporting done right
