Do changes (19/27)

Do changes