Added some tracker code