Fixed IsSelf & verified old distance and new distance are correct