Added ability to turn off asynchronous behavior (for testing etc)