EVENT-35
- Changed use of DateTime to clock