Further improve (I hope) the tick logic.