Got heat working correctly