Issue #22: Resolved previous step one implementation