Changes made to use with ARC