Swap 3

Update the pacakges and add some more.