added commenting
resolved merge conflict