added waits to remove overflows