Use correct waitalls when exchanging rows