addressing bottle-necks in the latest patch