Issue #1 Work.
Issue #2 Work