Take changes (11/28)

Take changes