Final Touches
Merge