modified for chrome update