Merging Yuriy's changes