Proposed final version