more changes. we stop for now.