Made loading better
Made loading better-er