Added a better implementation of UTM tracking.