First try of improving loading mode