More changes before pulling to hp.