updated exports and functions