Added safari support