add in legacy tracking