Take changes (17/28)

Take changes