Added comments to describe what I did to fix tracking issue.