Initial changes post-INN feedback.