made changes for google api requirements