Minimal changes to arm_controller.py and shape_match.py