Moved from step to async