Updated to newest code

after all of the reverting