Updated P&T to match Wedekind's