Changed to an asynchronous layout