Initial with Review comments updated