Code Review amendment.