Dev faster loading

Better loading