trying to fix A2
resolved merge