Exploratory changes. Needs review.