Modernize and convert to ARC