Added more browser compatibility