refacting to put timer name into ON clause