Adding changes as per feedback Doc