Addressing Igor comments #2