Recreated viewController due to xcode bug
Updated editEventWrapper