working on tracking