tracking issues
removed shortener..