added tweaks to load time