Firefox compatibility
Firefox compatibility
removed merge conflicts