Added upgraded tracker