Update from Dan2552/timereporter