     ss1.put(AmbLight); // Always send ambient light level (assuming sensor is present).
     // Show TRV-related stats since enabled.
     ss1.put(NominalRadValve); // Show modelled value to be able to deduce call-for-heat.
-    // ss1.put(NominalRadValve.targetTemperatureSubSensor); XXX
-    // ss1.put(NominalRadValve.setbackSubSensor); XXX
+    ss1.put(NominalRadValve.targetTemperatureSubSensor);
+    ss1.put(NominalRadValve.setbackSubSensor);
     // Show state of setback lockout.
     ss1.put(V0p2_SENSOR_TAG_F("gE"), OTRadValve::getSetbackLockout(), true);
 

    // Handling the UI may have taken a little while, so process I/O a little.
    if(recompute || valveUI.veryRecentUIControlUse()) {
        // Force immediate recompute of target temperature for (UI) responsiveness.
        // NominalRadValve.computeTargetTemperature(); XXX
        // Keep dynamic adjustment of sensors up to date.
        updateSensorsFromStats();
    }

  setbackLockout>
  cttBasic;

// Internal model of controlled radiator valve position.
OTRadValve::ModelledRadValve NominalRadValve(
  &cttBasic,
  &valveMode,
  &tempControl,
  &ValveDirect,
    false,
    100);

// Valve physical UI controller.
valveUI_t valveUI(
