Contacts overhaul