Added subpixel tracking