Added proper code for firefox picking