Finished Thermal revisions.