Adding vanilla tracking