Text now works
Merge