Changes as per latest feedback.