reorged a bit and made first load more robust