updated for latest ealib/xcode