changes for firefox
resolving merge conflict