Updated so many things I don't remember anymore