This sounds about right, and should be incorporated everywhere.