Addressed Issue 5