added texting
merging