added additional loations
resolved merge
converted