Pandas rework on WWF