Added smooth extra heating; removed unused variables