Modified variable tracking