Accommodated @weitzman's recommendations.