Proposal patch for v33

New changese in the code base, might not work