Updated per discussions from Neosho meeting