Upgraded most things