more debug, add wait-for-complete