only text change and 1 bug fix