added changes for new xcode version