First draft of revising Arms and Arm. Untested.