Take changes (8/28)

Take changes