Added code from SRLM for time based tacking. Will share with team.