Updated pretty much everything