? 46-55: Should this code be in the final version?