Updated for winter series and added functionality to cope with TCF resets