Changes as per Chris comments and resolved merge conflict issue