Added stop feature