More changes to everything for heattttt