modifs in Async methods
other small modifs