Updated for Xcode6-Beat5