stopping agents refactored