All my previous review comments have been addressed, either through a mail exchange or in version -16/17. Thank you!