fixing google, performance improvement