Issue #6, #7 #8.