pull stuff
stuff
functions fixed