Better tracking of current node