make tracking works. Still doesn't render correctly the stuff