Final Merge of First Update