updated tracking to be done as dynamic call back