Added teardown terminate now