Pally Ret Updates
Merge
Bug Fixes