Addressing Igor comments