added new tracking stuff