Merge of updates #2