started generalization to Flow graph
sync for Xcode project consistency