Added contact checking and comments