timestamps are accurate (instead of static)
Merge branch 'shiv'