added tracking to client