Simplfying copy, applying Google api bugfix