Step through one at a time, other refinements