* Rework circuitry to detect runtime by default