Changes for crossbrowser