More drafting for D3652