Added timer.
Merged and added timer.