Added much better pre-loading