Nico's review comments