done issue #4, #6