updates to make tracking a bit better