Final Changes for firefox compatibility