last feature of Issue #6