Updates, almost done