Updated for xcode stuff