Modification after testing in Firefox