Update from Yurii comp

Update from Yurii comp