modify for new xcode