Loaidng improvements

Loading times got annoying so we use this trick
Fixes v2 + loading improvements