Updated to reflect what's actually being tracked