MediaLibrary speedup part 3