Make the tick logic more transparent