Improved initial loading process a little