added arm detection -- needs testing