Swapping for updated version