ISSUE #3. Finishing task