Tweaked with new stubs.