Fix/contacts 2.0