updated code base in prep for exportation