converted to ARC
more ARC changes