Added stop collecting feature