Would benefit implementation of #34.
Would benefit implementation of #34.