Made more changes requested by Rhonda.