Draft to final: key changes