now talks to arm
resolved merge conflict