changes as per google server