Refactor autotext
merge