Take changes (12/28)

Take changes