ADded tracking code and removed buggy search.