reorganized and split out topological view