Merge of new features