started on #81 but too slow on IE - comment out for now