2.4. Proposal handling changes