updated to reduce initial page load