Updated export
Rearranged
Renamed func