Helped update it a bit. Can revert if you want.