Made it compatible with ARC

Made it compatible with ARC