Igor S comments implemented