Issue #9, Issue #6 and issue #5