added tracking code... FINALLY!