Made some tweaks to when the timer runs.
Made some tweaks to when the timer runs.

concord-consortium/testswarm,newzly/testswarm,kcomkar/testswarm,newzly/testswarm,rwaldron/testswarm,kcomkar/testswarm,rwaldron/testswarm,concord-consortium/testswarm,newzly/testswarm,newzly/testswarm