Updated, still loading too slow