More changes ... hopefully final ones.