tested and fixed s1p exporting