merged with twitter integration changes