Added basic tracking code fixes #2