Merge "Change temp approximations to be accurate" into main