changes as per shared doc