Bug Fix
Add some new for ShapeShifter