updated for current Xcode