added wait for all actions
resolved merge