Integrated Ben's changes, added timer.