Modified for one temp controller
Merge