In the process of reworking 3.47