Synchronizing code, fixing google module