addding more tracking