Tweaked for testing, all calls immediate