Fixed interaction issues
Merge origin/WorkingNewArch into WorkingNewArch