Working on better support for ie9/10