OOPS
General Fixes
Revert "For Trial"

This reverts commit 0913e8d4fe0d6af7cbf1ad9b533c1677216ea981.