Do changes (6/27)

Do changes