more consolidating, mostly discussion