CHanges to improve responsiveness of page load