FND implenenet, PZ upgraded.