update as per review for Issue #3