Issue #3 update to match dns