Converted to Modern Objective-C syntax