Modified the online tracking accordingly