Fixed hardcoded values in heatmaker