Further Async-preperation and optimization.