Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
Consider using "using".