last commit before adding google api branch