replaced more stubs