Addressed all issues from Niqs review.