Added some extra tracking code, but it hasn't shown up in the generated docs...