added teardown handler