I've noticed that the implementation here is as the first version based on the spec. There is a second version on page 46. Could you help confirm if the implementation is correct? Thanks!