Take changes (19/28)

Take changes