Switched to using a timing-threshold approach