Moved around functions and removed unnecessary things
fixed merge conflict