Fix/contacts 2.0

I don't know. This is Roy's magic.