updated for new Xcode