More accurate online tracking #76