Keep track of things a bit better