added a few new tracking features