Changes to make it compatible with google