adding stubs and more