Refactoring
Refactoring
Added text-only overlay
Minor changes
Changed names of convenience methods