Yes to both @arrbee's suggestions.