more code + integration test