Pull request from Gerald, added timer.