Flurry view added.
Conflicts fixed