Lots of fucking changes