More work on stop