Fixes
Refactor for ARC