minor changes including tracking code