Diana rework by David Moleon