Changes to improve page load time