Revert "Code Update"

This reverts commit e68102848a9fe4b1e984e699f40b69895e6de3ac.
Revert "Revert "Code Update""

This reverts commit 8343a10a2fc3a5774cfe6ee01e95c345c28e7f3e.