Will wait for input from @ahgittin . @grkvlt seemed happy as is. (@grkvlt can you confirm?)