Fix off by 1 error
Add DNS lookup