added cois
resolved merge conflicts