STM input adjustments
StopWatch added