Adjustments recommended by google group and feedback