Change from count to stop type