Update to latest version of Bill's code with update to deal with browser issues