Reformatting; initial work on stops