Added Calorator Functionality