Take changes (24/28)

Take changes