Updated for hw by B.