Updated tracking tags. Rounded out addition of tags