some refactors to include google
fix integration with google