some minor modifications to ensure tracking works, it does :)