Update for not hanging the browser