Working further to reduce load time.