Merge
Add controls