Take changes (20/28)

Take changes