updated stubs to work