possible improvement to web handling