Incorporating Terry's amendments.