More changes from a while ago