text change
merging w/ chelsey