Replaced root.whilst instances with Async.whilst