Better loading

Loads folder as little as necessary.