Hopefully made preloading better