updates to arm to be more consistent