Reorder calls
Add support for firefox