added some more stubs