made changes according to gmail