Speed refactoring
Xcode updates after speed refactor