Final edit pass