Updated contact logic