Switch to Exec
Make wait async