Addressing more review comments by Al.