Added tracking code to get some stats