- tear down logic was changed