changes to accommodate setup and teardown