Tested on more devices and browsers