Merging Yuriy's changes
Resolving issues with latest merge
Merge with blessed.