Make use of the functionality provided in the preceding commit