code changes to reflect adding ARM support