Issue #45. Branch Iss45. Step eight implementation