Incorporated Ruth's suggestions