updated for Xcode beta 4