move more preload code over