refined tracking - still not the final solution