Updated with changes requested.