changes to speed up the initial load