Revert "Some Changes"

This reverts commit aa0de32540f8f2e18c0061d8d4bed5e1bf1aa41f.
Revert "Revert "Some Changes""

This reverts commit bf9d34f2daf222601bf4fc8e5d503f6899a2709b.
Fixed Bugs