merged with conversocial changes