Removing dns checks
Refactor points a little bit