Part of #171
Part of #171