Revert "merged lastest changes"
Made some changes I didn't want to make

This reverts commit 3055d399b18626bea0651f20823939ec4b69e7f7.