More polishing of afterview