added tracking

resolves issue 9