Add @cheykoffs suggestions. Thanks!
Merge in @DrGeli's changes