Tackle Issue #1 and #2