Uh SO MUCH CHANGES... lol