Take changes (6/28)

Take changes