Changes from proposal_v2