Updates but still too slow