finish Issue #6