Updated for Firefox testing