Moved tracking code to body