Version with the fixed timer issue.