refactor to ARC
bump version
merge arc