Take changes (26/28)

Take changes