Changed to modern objective-C syntax