Change to int & fix names in heat