Work in progress for using new stubs