Merge and refactor
Update