Added tracking functionality for me and Kevin.