Incorporated Oliver's and Karen's suggestions