added @export to more functions