DX-655 - remove async from here, but add an id