added basic tracking, not accurate yet