Slightly tweaked the output in non-live mode.