Take changes (9/28)

Take changes