Issue #22: final step. Added comments