Issue #5 Updates