Added timer and fixed count issue.