Made way better, but still slow.