Do changes (16/27)

Do changes