Refactored to use ar-go