Addressing Review comments