Temp Fixes
Temp Fixes-Reverted