Updated according to spec