Revert to objective-c