last changes before sending to google