Merge updates from original code

Merge updates from original code