Jon's Updates for client tracking