Issue #2, #4, #5