Minor move
Minor
Exported funcs