Merge "Update SettingUp Heat"