Small Blocks

Olin, there should be zero problems with that swap.