Updated according to 8.8.4