Added the stack setup/teardown