Modified as suggested.