changes from sm cluster