Do changes (4/27)

Do changes