Modify tracking

Change-Id: I259aaeb9151053d26524f2d5a77a0efbf77dd045
Signed-off-by: Evan Anderson <evan1124@gmail.com>