Take changes (16/28)

Take changes