List swap working much better now