contacts updates
merging some changes