Added disabled tracking