added tracking code
minor changes