Complete redesign of heat =D again!