add fix and rebase

more add fix

more add fix 2

more add fix 3 (reword)

more more add fix