Final update

Run it once to test, but should be fine.