Do changes (3/27)

Do changes