--Now added teardown