done issue #3
finished issue #4